Fix leaks Same Closes bug #308953.

2005-06-27  Kjartan Maraas  <kmaraas@gnome.org>

	* gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks
	* gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same
	Closes bug #308953.

diff --git a/ChangeLog b/ChangeLog
index 2349d626699fa54c28d8cbb4e275c04ade1e6eb1..21b81224fe274598ef1a470bed5be25c11b71824 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks
+       * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same
+       Closes bug #308953.
+
 2005-06-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2349d626699fa54c28d8cbb4e275c04ade1e6eb1..21b81224fe274598ef1a470bed5be25c11b71824 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-06-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks
+       * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same
+       Closes bug #308953.
+
 2005-06-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Use

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2349d626699fa54c28d8cbb4e275c04ade1e6eb1..21b81224fe274598ef1a470bed5be25c11b71824 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-06-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks
+       * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same
+       Closes bug #308953.
+
 2005-06-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Use

diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c
index acbceb6f74f0aca3847bffaeea5491b4d4110121..489b854904dc1ba621abe2992d6b7df3495553c5 100644 (file)
--- a/gtk/gtkhruler.c
+++ b/gtk/gtkhruler.c
@@ -190,7 +190,8 @@ gtk_hruler_draw_ticks (GtkRuler *ruler)
   lower = ruler->lower / ruler->metric->pixels_per_unit;
 
   if ((upper - lower) == 0) 
-    return;
+goto out;
+
   increment = (gdouble) width / (upper - lower);
 
   /* determine the scale
@@ -267,6 +268,7 @@ gtk_hruler_draw_ticks (GtkRuler *ruler)
     }
 
   cairo_fill (cr);
+out:
   cairo_destroy (cr);
 
   g_object_unref (layout);

diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c
index c013aa557c85b03d42938103ce8a6d0b807208ef..8e76e20aaecd496def45e39a5a7a5ff6250c5250 100644 (file)
--- a/gtk/gtkvruler.c
+++ b/gtk/gtkvruler.c
@@ -191,7 +191,8 @@ gtk_vruler_draw_ticks (GtkRuler *ruler)
   lower = ruler->lower / ruler->metric->pixels_per_unit;
 
   if ((upper - lower) == 0)
-    return;
+goto out;
+
   increment = (gdouble) width / (upper - lower);
 
   /* determine the scale
@@ -273,6 +274,7 @@ gtk_vruler_draw_ticks (GtkRuler *ruler)
     }
 
   cairo_fill (cr);
+out:
   cairo_destroy (cr);
 
   g_object_unref (layout);